Don't corrupt odd keymaps (#316638, Kean Johnston)

2005-11-10  Matthias Clasen  <mclasen@redhat.com>

	Don't corrupt odd keymaps (#316638, Kean Johnston)

	* gdk/x11/gdkkeys-x11.c (set_symbol): Auxiliary function to
	handle frobbing keymaps with odd numbers of syms/code.

	* gdk/x11/gdkkeys-x11.c (update_keymaps): Use set_symbol() to
	frob the keymap.

diff --git a/ChangeLog b/ChangeLog
index a6ea6f5ad3f9b85e126470fe66e76bdf294055fe..cb08c032a88ed1a2684ef5c99a7379932c7c9764 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2005-11-10  Matthias Clasen  <mclasen@redhat.com>
 
+       Don't corrupt odd keymaps (#316638, Kean Johnston)
+       
+       * gdk/x11/gdkkeys-x11.c (set_symbol): Auxiliary function to
+       handle frobbing keymaps with odd numbers of syms/code.
+       
+       * gdk/x11/gdkkeys-x11.c (update_keymaps): Use set_symbol() to 
+       frob the keymap.
+
        Improve navigation to parent folders.  (#318444, Andrei Yurkevich)
        
        * gtk/gtkpathbar.[hc]: Add a child_path argument to

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a6ea6f5ad3f9b85e126470fe66e76bdf294055fe..cb08c032a88ed1a2684ef5c99a7379932c7c9764 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,13 @@
 2005-11-10  Matthias Clasen  <mclasen@redhat.com>
 
+       Don't corrupt odd keymaps (#316638, Kean Johnston)
+       
+       * gdk/x11/gdkkeys-x11.c (set_symbol): Auxiliary function to
+       handle frobbing keymaps with odd numbers of syms/code.
+       
+       * gdk/x11/gdkkeys-x11.c (update_keymaps): Use set_symbol() to 
+       frob the keymap.
+
        Improve navigation to parent folders.  (#318444, Andrei Yurkevich)
        
        * gtk/gtkpathbar.[hc]: Add a child_path argument to

diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index 25acbeb97918e16d59d5474710e38d5c8e61e1d8..d21d7d256b372d6ab0f02871a55230bdd4d03430 100644 (file)
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -323,12 +323,28 @@ get_symbol (const KeySym *syms,
   gint index;
 
   index = KEYSYM_INDEX(keymap_x11, group, level);
-  if (index > keymap_x11->keysyms_per_keycode)
+  if (index >= keymap_x11->keysyms_per_keycode)
       return NoSymbol;
 
   return syms[index];
 }
 
+static void
+set_symbol (KeySym       *syms, 
+           GdkKeymapX11 *keymap_x11, 
+           gint          group, 
+           gint          level, 
+           KeySym        sym)
+{
+  gint index;
+
+  index = KEYSYM_INDEX(keymap_x11, group, level);
+  if (index >= keymap_x11->keysyms_per_keycode)
+      return;
+
+  syms[index] = sym;
+}
+
 static void
 update_keymaps (GdkKeymapX11 *keymap_x11)
 {
@@ -374,7 +390,7 @@ update_keymaps (GdkKeymapX11 *keymap_x11)
          for (i = 0 ; i < 2 ; i++)
            {
              if (get_symbol (syms, keymap_x11, i, 0) == GDK_Tab)
-               syms[KEYSYM_INDEX (keymap_x11, i, 1)] = GDK_ISO_Left_Tab;
+               set_symbol (syms, keymap_x11, i, 1, GDK_ISO_Left_Tab);
            }
 
           /*
@@ -389,8 +405,8 @@ update_keymaps (GdkKeymapX11 *keymap_x11)
               gdk_keyval_convert_case (get_symbol (syms, keymap_x11, 0, 0), &lower, &upper);
               if (lower != upper)
                 {
-                  syms[KEYSYM_INDEX (keymap_x11, 0, 0)] = lower;
-                  syms[KEYSYM_INDEX (keymap_x11, 0, 1)] = upper;
+                 set_symbol (syms, keymap_x11, 0, 0, lower);
+                 set_symbol (syms, keymap_x11, 0, 1, upper);
                 }
             }
       
@@ -1201,7 +1217,7 @@ MyEnhancedXkbTranslateKeyCode(register XkbDescPtr     xkb,
     
     /* ---- End stuff GDK adds to the original Xlib version ---- */
     
-    return (syms[col]!=NoSymbol);
+    return (syms[col] != NoSymbol);
 }
 #endif /* HAVE_XKB */